-
Notifications
You must be signed in to change notification settings - Fork 121
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Upstream merge 2023 05 05 #997
Merged
samuel40791765
merged 15 commits into
aws:main
from
samuel40791765:upstream-merge-2023-05-05
May 9, 2023
Merged
Upstream merge 2023 05 05 #997
samuel40791765
merged 15 commits into
aws:main
from
samuel40791765:upstream-merge-2023-05-05
May 9, 2023
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
torben-hansen
previously approved these changes
May 8, 2023
samuel40791765
force-pushed
the
upstream-merge-2023-05-05
branch
from
May 9, 2023 18:40
e0089c0
to
410cbab
Compare
https://boringssl-review.googlesource.com/c/boringssl/+/57645 wasn't quite right. The cd to run ssl/test/runner affects the subsequent commands. Fix this by running the Go tests first. They're very fast compared to the others anyway. Change-Id: Id5ea54a9787173eb3ed80e9db2c9ecfe064a93b0 Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/57688 Auto-Submit: David Benjamin <[email protected]> Commit-Queue: Bob Beck <[email protected]> Commit-Queue: David Benjamin <[email protected]> Reviewed-by: Bob Beck <[email protected]> (cherry picked from commit e3a5face899e16183f1d207d7327baac57454935)
Follow-up to https://chromium-review.googlesource.com/c/chromium/tools/build/+/4296194/ But mostly I've since added a lot more configurations to CI and want to make sure I haven't broken anything. Change-Id: I627711356004bf2244bd729b6055e9e0e619724e Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/57691 Commit-Queue: Bob Beck <[email protected]> Auto-Submit: David Benjamin <[email protected]> Reviewed-by: Bob Beck <[email protected]> (cherry picked from commit f88b7c83979d128fa83eb5f9102be56cc4bec33c)
This made fido2's fuzzer angry: https://buganizer.corp.google.com/issues/271220905 Change-Id: Ib1b909be10f230df2daea3942f35cba0a81dcedb Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/57765 Commit-Queue: Bob Beck <[email protected]> Commit-Queue: David Benjamin <[email protected]> Auto-Submit: Bob Beck <[email protected]> Reviewed-by: David Benjamin <[email protected]> (cherry picked from commit e06f172bf22c098719d0d9b970f839b39dcd41ce)
Also turn assertions into static_assert where we can. These should be no-ops with existing assertions. The int assertion is tighter, but we already assert this in constant_time_declassify_int. We cannot support 64-bit int because it messes up integer promotion rules. Change-Id: I628d2d7decdfa8bc01d8c6013bc7c20f927d63b1 Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/57785 Reviewed-by: Adam Langley <[email protected]> Auto-Submit: David Benjamin <[email protected]> Commit-Queue: Adam Langley <[email protected]> (cherry picked from commit 93e8d4463d59d671e9c5c6171226341f04b07907)
ASN1_item_ex_i2d() does not take ownership of the memory pointed at by *out, so it's the caller's responsibility to free it on error. Change-Id: Id8cb70e50f280944418629a32b53fd4ca248b0bd Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/57805 Commit-Queue: David Benjamin <[email protected]> Reviewed-by: David Benjamin <[email protected]> (cherry picked from commit 3a7dfdb984434a4b4beef947b2e49602c557c0de)
I did not have "find a bug in the assembler" on my bingo card today, but here we are. NASM 2.15, prior to 2.15.04, has a bug where, if a section that already exists is referenced again with alignment qualifiers, it incorrect adds padding and mangles the output. See https://bugzilla.nasm.us/show_bug.cgi?id=3392701. Work around this by suppressing the perlasm-emitted qualifiers the second time a section is emitted. We likely don't need these qualifiers because, for all sections we care about, NASM's defaults are fine, but perlasm tries to align .text more aggressively than the default, so let it do that. Bug: chromium:1422018 Change-Id: Iade5702c139b70772d4957a83c8f9be86c8af97c Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/57825 Reviewed-by: Adam Langley <[email protected]> Commit-Queue: David Benjamin <[email protected]> (cherry picked from commit abb9af83bc223eca0ffffce246ed551f2fcd11e1)
When running on a device via `adb shell`, stdout will be a pipe and so is block buffered, leading to lost output if abort() is called before flushing. Change-Id: Ica67132fb8b2b1e7967df89fa3d0a9a793d8cbbf Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/54025 Reviewed-by: Adam Langley <[email protected]> Reviewed-by: Bob Beck <[email protected]> Commit-Queue: Bob Beck <[email protected]> (cherry picked from commit 082e953a134ad423a00b8859f9daf5708e729260)
Similar idea to https://boringssl-review.googlesource.com/c/boringssl/+/55466 Results are pretty close to the current state, e.g. tool speed goes from Did 74000 SHA-1 (16384 bytes) operations in 1004094us (73698.3 ops/sec): 1207.5 MB/s to Did 75000 SHA-1 (16384 bytes) operations in 1004022us (74699.6 ops/sec): 1223.9 MB/s But on AMD with prefetchers disabled and large enough data size, to force cache misses this gives ~3x improvement: name old time/op new time/op delta BM_SHA1Hash/2 141ns ± 1% 143ns ± 2% ~ (p=0.421 n=5+5) BM_SHA1Hash/4 143ns ± 2% 143ns ± 3% ~ (p=0.841 n=5+5) BM_SHA1Hash/8 141ns ± 1% 141ns ± 2% ~ (p=1.000 n=5+5) BM_SHA1Hash/16 141ns ± 1% 141ns ± 1% ~ (p=0.841 n=5+5) BM_SHA1Hash/32 143ns ± 2% 143ns ± 1% ~ (p=0.690 n=5+5) BM_SHA1Hash/64 178ns ± 1% 179ns ± 1% ~ (p=0.151 n=5+5) BM_SHA1Hash/512 454ns ± 1% 454ns ± 1% ~ (p=0.841 n=5+5) BM_SHA1Hash/4k 2.66µs ± 1% 2.65µs ± 1% ~ (p=1.000 n=5+5) BM_SHA1Hash/32k 20.3µs ± 1% 20.3µs ± 2% ~ (p=1.000 n=5+5) BM_SHA1Hash/256k 162µs ± 1% 161µs ± 1% ~ (p=0.548 n=5+5) BM_SHA1Hash/1M 644µs ± 1% 645µs ± 1% ~ (p=0.841 n=5+5) BM_SHA1Hash/2M 1.29ms ± 1% 1.29ms ± 2% ~ (p=0.690 n=5+5) BM_SHA1Hash/4M 2.58ms ± 1% 2.58ms ± 1% ~ (p=0.841 n=5+5) BM_SHA1Hash/8M 5.14ms ± 0% 5.15ms ± 1% ~ (p=0.286 n=4+5) BM_SHA1Hash/16M 11.4ms ± 3% 10.3ms ± 1% -9.04% (p=0.016 n=4+5) BM_SHA1Hash/128M 249ms ± 0% 83ms ± 1% -66.73% (p=0.008 n=5+5) Change-Id: I7cae746b6d8a705d6bf2d5c5df6a2dca6d44791a Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/57826 Commit-Queue: Adam Langley <[email protected]> Reviewed-by: Adam Langley <[email protected]> (cherry picked from commit ecb722aeeb7ec6fcd2d6c60d177b9e952eab51f8)
Change-Id: Ie7543047c6f489ae849b3c27703948f0977c33fd Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/57905 Commit-Queue: David Benjamin <[email protected]> Reviewed-by: David Benjamin <[email protected]> (cherry picked from commit 8aa51ddfcf1fbf2e5f976762657e21c7aee2f922)
RDNs are a SET OF attributes which means they should be sorted by DER encoding length, then lexicographically. We didn't have any test coverage for this. Bug: 548 Change-Id: I542196aae26984aeee4f1c6774878b121675b0dc Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/58025 Commit-Queue: Bob Beck <[email protected]> Reviewed-by: Bob Beck <[email protected]> Auto-Submit: David Benjamin <[email protected]> (cherry picked from commit d0cff637a25b8323578729a01575b62001967bc8)
Change-Id: I59bcacf10a59ffdf9709785727f5f8b73c992f6e Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/58026 Auto-Submit: David Benjamin <[email protected]> Commit-Queue: Bob Beck <[email protected]> Reviewed-by: Bob Beck <[email protected]> (cherry picked from commit 8c7aa6bfcd7573d7b904fde6acb4f3652a3ebecc)
Change-Id: I18596751776262be09d8ba09ed258e1f66d90654 Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/58046 Reviewed-by: Adam Langley <[email protected]> Commit-Queue: David Benjamin <[email protected]> (cherry picked from commit 74646566e93de7551bfdfc5f49de7462f13d1d05)
An in-progress rewrite of tasn_dec.c accidentally broke this, so add a regression test. Bug: 548 Change-Id: Iac6a23acbc08459187c96a2f6471f0aa97d445a1 Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/58125 Auto-Submit: David Benjamin <[email protected]> Reviewed-by: Bob Beck <[email protected]> Commit-Queue: Bob Beck <[email protected]> (cherry picked from commit 6a231e5c6e2b299da0be16e1edbb0195265afec3)
With EVP_PKEY and EVP_PKEY_CTX opaque, these symbols don't appear in any public APIs anymore. Make them internal, which also opens the door to renaming them: - EVP_PKEY_METHOD is more accurately EVP_PKEY_CTX_METHOD - EVP_PKEY_ASN1_METHOD is more accurately EVP_PKEY_METHOD Or perhaps the split doesn't mean much and we should fold them together. Change-Id: I8a0f7c2e07445dc981c7cef697263e59dba7784e Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/57885 Commit-Queue: David Benjamin <[email protected]> Auto-Submit: David Benjamin <[email protected]> Reviewed-by: Bob Beck <[email protected]> Commit-Queue: Bob Beck <[email protected]> (cherry picked from commit a925c220c123af0bdd49be3a8a84a506584c1fb2)
samuel40791765
force-pushed
the
upstream-merge-2023-05-05
branch
from
May 9, 2023 18:40
410cbab
to
5671f65
Compare
torben-hansen
approved these changes
May 9, 2023
dkostic
approved these changes
May 9, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes:
Merge (some) changes from uptream
Testing:
CI
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license and
the ISC license.